Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Little things update #442

Merged
merged 16 commits into from
Oct 3, 2024
Merged

Little things update #442

merged 16 commits into from
Oct 3, 2024
+1,201 −0

Conversation

AnderFan
Copy link
Contributor

@AnderFan AnderFan commented Sep 9, 2024 •
edited by PyotrIgn
Loading

Перенесены:

  • Обручальные кольца
  • Банный веник
  • Деревянный лежак
  • Свадебные платья
  • Свадебные букеты
  • Добавлен в список заказов: набор колец, свадебный набор.

🆑

  • add: Добавлены наши обручальные кольца в заказ карго-развлечения
  • add: Добавлены наши свадебные и просто платья в заказ карго-развлечения
  • add: Добавлены наши букеты

@github-actions github-actions bot added Changes: Sprites Изменение спрайтов No C# Changes: Localization Изменение локализации labels Sep 9, 2024
@github-actions GitHub Actions
Copy link
Contributor

github-actions bot commented Sep 9, 2024 •
edited
Loading

RSI Diff Bot; head commit 156b133 merging into 5ef94aa
This PR makes changes to 1 or more RSIs. Here is a summary of all changes:

Resources/Textures/ADT/Clothing/Hands/Rings/RingBlood.rsi

State Old New Status
equipped-HAND Added
icon Added
inhand-left Added
inhand-right Added

Resources/Textures/ADT/Clothing/Hands/Rings/RingEmerald.rsi

State Old New Status
equipped-HAND Added
icon Added
inhand-left Added
inhand-right Added

Resources/Textures/ADT/Clothing/Hands/Rings/RingPlazma.rsi

State Old New Status
equipped-HAND Added
icon Added
inhand-left Added
inhand-right Added

Resources/Textures/ADT/Clothing/Hands/Rings/RingTurk.rsi

State Old New Status
equipped-HAND Added
icon Added
inhand-left Added
inhand-right Added

Resources/Textures/ADT/Clothing/Uniforms/Jumpskirt/black_elegant_dress.rsi

State Old New Status
equipped-INNERCLOTHING Added
icon Added
inhand-left Added
inhand-right Added

Resources/Textures/ADT/Clothing/Uniforms/Jumpskirt/black_ghotic_dress.rsi

State Old New Status
equipped-INNERCLOTHING Added
icon Added
inhand-left Added
inhand-right Added

Resources/Textures/ADT/Clothing/Uniforms/Jumpskirt/lush_rose_wedding_dress.rsi

State Old New Status
equipped-INNERCLOTHING Added
icon Added
inhand-left Added
inhand-right Added

Resources/Textures/ADT/Clothing/Uniforms/Jumpskirt/lush_white_wedding_dress.rsi

State Old New Status
equipped-INNERCLOTHING Added
icon Added
inhand-left Added
inhand-right Added

Resources/Textures/ADT/Clothing/Uniforms/Jumpskirt/orange_beach_suit.rsi

State Old New Status
equipped-INNERCLOTHING Added
icon Added
inhand-left Added
inhand-right Added

Resources/Textures/ADT/Clothing/Uniforms/Jumpskirt/red_cocktail_dress.rsi

State Old New Status
equipped-INNERCLOTHING Added
icon Added
inhand-left Added
inhand-right Added

Resources/Textures/ADT/Clothing/Uniforms/Jumpskirt/shortdressblackgold.rsi

State Old New Status
equipped-INNERCLOTHING Added
icon Added

Resources/Textures/ADT/Clothing/Uniforms/Jumpskirt/white_ghotic_dress.rsi

State Old New Status
equipped-INNERCLOTHING Added
icon Added
inhand-left Added
inhand-right Added

Resources/Textures/ADT/Clothing/Uniforms/Jumpskirt/white_short_wedding_dress.rsi

State Old New Status
equipped-INNERCLOTHING Added
icon Added
inhand-left Added
inhand-right Added

Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/airy_black_suit.rsi

State Old New Status
equipped-INNERCLOTHING Added
icon Added

Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/airy_white_suit.rsi

State Old New Status
equipped-INNERCLOTHING Added
icon Added

Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/black_wedding_suit_male.rsi

State Old New Status
equipped-INNERCLOTHING Added
icon Added
inhand-left Added
inhand-right Added

Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/black_wedding_women_suit.rsi

State Old New Status
equipped-INNERCLOTHING Added
icon Added
inhand-left Added
inhand-right Added

Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/blue_wedding_suit_male.rsi

State Old New Status
equipped-INNERCLOTHING Added
icon Added
inhand-left Added
inhand-right Added

Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/brown_wedding_suit_male.rsi

State Old New Status
equipped-INNERCLOTHING Added
icon Added
inhand-left Added
inhand-right Added

Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/white_wedding_women_suit.rsi

State Old New Status
equipped-INNERCLOTHING Added
icon Added
inhand-left Added
inhand-right Added

Resources/Textures/ADT/Objects/Misc/bathbroom.rsi

State Old New Status
icon Added
inhand-left Added
inhand-right Added

Resources/Textures/ADT/Objects/Specific/Service/RingBox.rsi

State Old New Status
box-inhand-left Added
box-inhand-right Added
box-open Added
box Added
box2 Added
box4 Added
box6 Added

Resources/Textures/ADT/Objects/Specific/Service/black_bouquet.rsi

State Old New Status
icon Added
inhand-left Added
inhand-right Added

Resources/Textures/ADT/Objects/Specific/Service/bouquet_with_beer.rsi

State Old New Status
icon Added
inhand-left Added
inhand-right Added

Resources/Textures/ADT/Objects/Specific/Service/liliac_bouquet.rsi

State Old New Status
icon Added
inhand-left Added
inhand-right Added

Resources/Textures/ADT/Objects/Specific/Service/rose_bouquet.rsi

State Old New Status
icon Added
inhand-left Added
inhand-right Added

Resources/Textures/ADT/Objects/Specific/Service/white_bouquet.rsi

State Old New Status
icon Added
inhand-left Added
inhand-right Added

Resources/Textures/ADT/Objects/Specific/Service/yellow_bouquet.rsi

State Old New Status
icon Added
inhand-left Added
inhand-right Added

Edit: diff updated after 156b133

1Stepka1
1Stepka1 requested changes Sep 10, 2024
View reviewed changes
Copy link
Collaborator

@1Stepka1 1Stepka1 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

В Resources/Textures/ADT/Objects/Weapons/ находятся букеты,хоть сами букеты находятся в Resources/Prototypes/ADT/Entities/Objects/Specific/Service/bouquets.yml значит путь у них должен быть Resources/Textures/ADT//Objects/Specific/Service/bouquets.rsi

Resources/Locale/ru-RU/ADT/Catalog/Cargo/cargo_fun.ftl Outdated Show resolved Hide resolved
Resources/Locale/ru-RU/ADT/prototypes/Entities/Clothing/Hand/gloves.ftl Outdated Show resolved Hide resolved
Resources/Prototypes/Recipes/Construction/Graphs/furniture/bed.yml Outdated Show resolved Hide resolved
Resources/Prototypes/Recipes/Construction/Graphs/furniture/bed.yml Outdated Show resolved Hide resolved
@github-actions GitHub Actions
Copy link
Contributor

This pull request has conflicts, please resolve those before we can evaluate the pull request.

@Bolper Bolper added the Status: Awaiting Changes Ожидание изменений label Sep 11, 2024
@Bolper Bolper self-requested a review September 11, 2024 17:13
@github-actions github-actions bot removed the Status: Awaiting Changes Ожидание изменений label Sep 11, 2024
@Schrodinger71 Schrodinger71 added Status: Awaiting Changes Ожидание изменений and removed Status: Needs Review labels Sep 11, 2024
@github-actions GitHub Actions
Copy link
Contributor

This pull request has conflicts, please resolve those before we can evaluate the pull request.

@github-actions github-actions bot added Status: Needs Review and removed Status: Awaiting Changes Ожидание изменений labels Sep 21, 2024
Bolper
Bolper previously requested changes Sep 23, 2024
View reviewed changes
Copy link
Contributor

@Bolper Bolper left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

че то хотел сказать но забыл... Чекни свой ПР на актуальность

Resources/Locale/ru-RU/ADT/Catalog/Cargo/cargo_fun.ftl Outdated Show resolved Hide resolved
Resources/Locale/ru-RU/ADT/prototypes/Entities/Clothing/Hand/gloves.ftl Outdated Show resolved Hide resolved
Resources/Locale/ru-RU/ADT/prototypes/Entities/Clothing/Hand/gloves.ftl Outdated Show resolved Hide resolved
Resources/Locale/ru-RU/ADT/prototypes/Entities/Clothing/Uniforms/jumpskirts.ftl Show resolved Hide resolved
Resources/Prototypes/ADT/Entities/Objects/Misc/ring_box.yml Outdated Show resolved Hide resolved
Resources/Prototypes/ADT/Entities/Clothing/Hands/gloves.yml Outdated Show resolved Hide resolved
Resources/Prototypes/ADT/Entities/Objects/Specific/Service/bouquets.yml Outdated Show resolved Hide resolved
Resources/Prototypes/Recipes/Construction/Graphs/furniture/bed.yml Outdated Show resolved Hide resolved
Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/airy_white_suit.rsi/meta.json Outdated Show resolved Hide resolved
@github-actions GitHub Actions
Copy link
Contributor

This pull request has conflicts, please resolve those before we can evaluate the pull request.

1Stepka1
1Stepka1 requested changes Sep 24, 2024
View reviewed changes
Copy link
Collaborator

@1Stepka1 1Stepka1 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Такс,у визардов добавились колечки,значит то что здесь надо передалать на тот лад который у них,то есть все из gloves.yml в rings.yml тоже самое относится к пути файлов текстур,перенести их в Resources/Textures/ADT/Clothing/Hands/Rings.

Resources/Textures/ADT/Objects/Weapons/Melee/black_bouquet.rsi/meta.json Outdated Show resolved Hide resolved
@Schrodinger71 Schrodinger71 added Status: Awaiting Changes Ожидание изменений and removed Status: Needs Review labels Sep 27, 2024
@PyotrIgn
Copy link
Contributor

PyotrIgn commented Oct 2, 2024

@Bolper @1Stepka1
Взял на доведение до конца этот пулл реквест
Поработал по вашим ревью, проверяйте

@PyotrIgn PyotrIgn added this pull request to the merge queue Oct 3, 2024
Merged via the queue into AdventureTimeSS14:master with commit b506d0b Oct 3, 2024
15 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@PyotrIgn PyotrIgn PyotrIgn left review comments

@1Stepka1 1Stepka1 1Stepka1 approved these changes

@Bolper Bolper Bolper left review comments

@Darkiich Darkiich Awaiting requested review from Darkiich

@Schrodinger71 Schrodinger71 Awaiting requested review from Schrodinger71

Assignees
No one assigned
Labels
Changes: Localization Изменение локализации Changes: Sprites Изменение спрайтов No C# Status: Awaiting Changes Ожидание изменений
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
5 participants
@AnderFan @PyotrIgn @1Stepka1 @Bolper @Schrodinger71